[WIP] Minor fixes to 0.10

...pe configured.