Fixes to weekends