More polish fixes