Merge Latest Fixes