Pre-1.4.1 fixes and changes