Fix SMES issues