Forgot to return the instance.
MInor fixes.