Some fixes
Small hack