Some fixes
Fixes