Minor tweaks

@kaelig