fix annotations (delete @size) and add nullable to unit