Some fixes and App.net annotation types