first attempt to fix compilator errors