[Fixes] Some fixes