Fixed compiler warnings and imports
2 files changed