Minor tweaks for fluent interface