Partial 1.4.7 update