Adds fixes from merge