Fix statement defaults