Fix some minor input issues
Merge branch 'master' into db-fixes