Fix regression, small tweaks