Fixed compatibility issues with Impact++