Remove a bunch of warnings (sorry for the annoyingly commit, got < 2 minutes to kill