Minor bugs and enhancements in bunny facing code.