Fixes some bugs to 1.4.0 migration