More bugs more fixes