Small tweaks for testing

Started testing of before routes and have to stop for now so
I'm just committing some minor tweaks that I had made. Nothing
major for the moment.