[FIXES] Some fixes