Fix compile errors (now for real)