Parameter-related fixes