Wednesday afternoon additional fixes