Further 0.9.3 changes.