Tweaked a few things from the recent PR