Updates following testing on new EC2 instance