Additional 0.4.8 work