Fix the hartshire stuff