Adding an annotation to use flow.
And fixing the warnings/errors.