Fixes

Some minor improvements...