#master: Fix some errors on router js component