Address metajack's comments