Fix up build errors with plugins