Error messaging, Options bug fixes