cross over bug fixes