More code tweaks.