fixes for unimported classes