Fixes with statement setting errors