Fix up conditional derps