FIXED: wrong types used in some ivar declarations