Bug fixes, annotations removed