Fixed some issues in Exercise classes

Fixed some issues in Exercise classes