Minor fixes, changes, and additions