Fixed some bugs I found while deployed.