Adding changes as found on staging AMI.