Fixes From merge