AnnJS improvements