fixing errors

Please review the changes done.