pat's fixes