Fixes for V1.3