Gabe's fixes