Fixed some issues mentioned by Saeed