Some fixes

So that's how you build AT for "modern" routers :)