Some issues (17/21)

Some issues