Further refactor fixes / tweaks