More Annie fixes