Additional code tweaks