fixes due to jdan/cleaver/#60