A little housekeeping and deployment fix for AWS