Fixes

Some fixes