Merge and Fixes