Few bug fixes to last attempt

--CAR