Fixed broken URLs after Chris' API rearrange