Fixing a few things that were broken with the last update.