Fixing/merging stuff.