sam's fixes