Fixed some bugs with the last update.