Remove some of the stricter requirements