Cleaned up imports and fixed some warnings