Minor fixes and routes reinforcement