Fix #337 (Compilation errors)