Make things work for staging