Some issues (19/21)

Some issues