Added fixes to exercises, especially missing imports