Committing some bugs found on our work page