Modifying and fixed compatibility errors