Fixed a few errors that were caused by update