Fixed all the imports and all the warnings