Some issues (20/21)

Some issues