Minor misc fixes
Merge branch 'master' of git://cadel.mutabah.net/acess2
Merge branch 'master' of ssh.ucc.asn.au:tpg/acess2