couple of small fixes
merging in changes from galileo

Merge branch 'master' of https://github.com/theanswer42/alexandria