Bugs fixed with custom routing stack problem