annie bug fixes