Fixes and manual merges