Small polish tweaks