Compile fix and imports