Fixes and merges