Use Sam's fixes instead of a helper file
Use the right default