Two fixes for the changes in parameter handling.