Fix issues with OPTION requests