Dan's fixes in progress