url fixes etc