Date parsing problem hack
Course types fix