Minor base updates
Merge pull request #1107 from darkwing/base-updates

Minor base updates