Some fixes to Schedule model