Minor tweaks and fix bork