Fix some errors and warnings with newer gcc compilers
Also fix a typo in the description of ann()