- fixed missing imorts and compile errors