Initial fixes before 1.4.5