Last minute fixes
Merging fixes