Some fixes due to merging issues