A few fixes for cors