Some issues (12/21)

Some issues