Merge & Fixes