Fixed some surprise build errors (after merging, or thanks to a bad make file?)