Update all to 1.4.7, fix a couple of bugs