Fixes for V1.5