Some fixes

Fixes