Bug fixes for making killbill test pass