Some minor compilation fixes