Controller bug fixes.