SMall fixes