fix import, remove warnings