Fix bas url problems