Bugzilla 4.4 compatibility fixes

Fixes #8, fixes #11