Fix handling of separation defaults