Fixed arguments for some functions (fixes #9)