fixes for cases where Ada type is supplied