More bugs removed