Some cmake fixes.