Fix various issues reported by Simon