Fixing up changes, more to come