Checking in additional fixes