Missing args

Few fixes to issues caused by missing parameters