Fix some ALLOW_OPTIONS stuff (part 2)