Support function overloads
Fix time advance in functions