Fixes for the new Origin behavior