Fix last compile errors