Fixes for 1.4b2