Fixed some imports and method names