Fix the param checks based on Ben's review comments