fixes for function calls