General bug fixes
Bump to 1.4.2