Some issues (18/21)

Some issues