Just a few code tweaks