Fix up compilation