More fixes; still need a solution for the "super" problem