Fix Mojang/Amazon server issues hopefully for real this time