Fixing up some mistakes