Updated controller abstract uses
Small fixes in build
Some fixes to work with controller routers