FINIS: Fixes

Fixes for some minor issues.