added annotation fixes for build and release