Some fixes to the if command