fix classes for helium pbjects #8 and #14