Various bug fixes.
Include plain params.