Fix warnings

This shouldn't be merged right now.

Just discuss it if you want!