Some issues (8/21)

Some issues