Tweaks to boundry stuff