Fixed some things that were made in master