Added few more fixes