Correct some ‚class not fount‘ errors