More compilation issues with 2.1.2