More of Gabe's fixes