Fix some minor oopses (thanks to Brane for noticing).
Fix some minor oopses (thanks to Brane for noticing).

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion