Fixes for V1.9