chad's fixes