Fixed some imports and warnings