Fixed some things due to git conflicts