Added the last round of bug fixes that got missed