Fixed entry conditions/exceptions