Fixing issues mentioned by Babar Tariq