fixing patch issues