Fix build warnings

Nice and tidy