Fix last issues with restructuring