Fixes

Some small fixes to start with.