Minor formal fixes