Fix few more problems in code