Various fixes reported by Ken