Next error-fixes