Minor fixes, related to merging