Little fixes on webmodel