Fix compile errors for good