Fix small url errors
Fix more includes