Some fixes
fix