Simple formal fixes