Fixes to annotations editor