litle fixes to run application correctly