minor fixes
minor fixes
Merge branch 'master' into mapdb2