fixed some warnings and broken annotation type checks