Docs and F17 ec2 build fixes