Fixed some scope stuff which weren't that relevant anyway