minor changes to fix model problems