Fixes for positional arguments