Fixes

Minor fixes