Some more updates for 1.4.6