Fixes in models (table names not static)