Fixes before v1.5