Snall fixes