Use actual types for arguments

this required some bugfixed to unscripted