bug fixes for project upgrade