Fixes for v1.3