Param convention fixes