Bug Fixes in models