Fixes after AWS proisioning