Fix annotations and exports