Some tweaks from initial practical use