Mergefix and comments