More bugs solved