more late fixes