A few more fixes from Bug 720068 reported by Demian Katz.