A few bug fixes and updates to annotations