Hopefully fix some  Call-time pass-by-reference errors