Quick statement fixes