Fix last build errors