Fixing bugs in hours_this_week