Fixed the type of a few parameters