More outbund fixes/improvements