Fixes for intrinsic functions