Fixed some imports and other stuff