Move url fixes