Fixes in servises and controllers