Little last tweaks