Fixes after switching router