Fix some minor form label issues