Fixed: some defs