Merge fixes and removing warnings