[FIX] small fixes to make it to run