Fixed parameter types of a couple of functions