Fixes before release 1.5