Fix warnings etc.