Fix missing annotations and clean up.