FYI: some cleanup fixes