Minor code tweaks.