Some fixes(Should works)