More Fixups.. zzz