Holiday on Scheduled Day Off

We are using the standard time-sheet and have employees assigned to "Schedules".  The company awards Holiday pay for all employees regardless of whether it's a scheduled work day.  We are new to Gen 3 and "Office Schedules" with our first holiday being this Friday.  Currently our employees that aren't scheduled are unable to record the Holiday and receive the following error message: 

This holiday booking must include at least one day which is not a weekly day off.

For our shift schedule workers we no longer auto populate holidays because if they work that holiday they actually are scheduled to work then they are using a different Holiday Code that counts towards their weekly Overtime Time Totals.  

Given the common occurrence where Holidays are paid regardless of the employees schedule in the US there needs to be an option to record the Holiday or really any Time Off on an unscheduled work day. 

A separate related issue is that, it's our policy to only pay certain time off types up to 8 hours for a day (Holidays for Example). If we choose "Day" as a the default our 12 hour shift workers are awarded 12 hours of Time Off using the "Full Day" selection under the Time Off Setting.  Yet if I choose full hour or none under the time off settings they can then record amounts other than 8 as well.  This system needs the ability to lock in a fixed amount of hours for certain time off types with Holidays being the most important. 

In general when tied to schedules and also for non standard work day hours the time off flexibility needs to be improved.