Cleaned up a few missed items from update 2