Update: fix URL prefix
Update: fix misc