[FIX] Fix mistypes that cause exceptions