Fixing stuff
Merge