Fixes in models