Minor gracer tweaks