fix controller spec & mode spec refs #482