Fixed the stuff I broke with the last major update.