Fix some paths and routes