Fix compile errors with separation