Fixes from testing on HP Cloud Instances.