Fixes with table prefix