Few final tweaks following yesterdays build changes.