Weeded out some bugs