Fix remaining compile issues