Merging new fixes with old commit