Minor code tweaks, nothing important.