Tom Moody fixes