Final minor 0.4 changes