L&F fixes to modeling