A couple of commits from work, some a bit cluttered with work related stuff.