Fixes for parameters with spaces