Merging up fixes