Fixes for function calls