Change\correct some parameter boilerplate