Fixing up metadata in fpwd branch...