Fixed some extra stuff