JS annotations and fixes