Merging ing some fixes