Fixed some instance table lookups