More compile fixes

This should've been created on top of my previous pull but unfortunately I have to go before you come back. You shouldn't have trouble merging it, though.