fixing remaining warnings for Phase 1 (WIP)