More minor cleanup and handling

git-svn-id: http://svn.code.sf.net/p/autowikibrowser/code/AWB@9858 5227b50d-9349-4574-b055-4b0a7525e11c