More modernization fixes