fixed few errors found using analysis tool