Fix compile errors/warnings due to imports.