Fixes and merging