Did some bugzilla cleanups