Fixes for v1.4