Final Submit bug fixes