Few more potential bugs fixed