small fixes in Controller

adjusted some  last change related issues