Fixes after merge so it compiles because i am stupid