Slight fixes to make options clearer