Fixed the last 2 errors