fixed issues to allow compliation without errors