Other small code tweaks