Fixed some imports to make sure the client doesnt crash