[1.0.0] Some fixes