More updates to fix AWS stuff