Incomplete fix for bugzilla revision bug + refactoring