Several small fixes to Amazon AWS deployment