A small batch of improvements