Some smads fixes