Performance fixes for special case