* fix some of the fallout of the last commit