More fixes - Clean params better and missing sql