Fixed an import issue and a case statement.