More bugs fixed