Fix variables, error feedback