some minor damage control after merge