Minor changes because VS fucked up a few things