A few error fixes.