Fix positional args for prepare and parse signature