Fix trying to assign a function pointer to a variable of the wrong class of function pointer
Fix base module functions to call the functions for the correct classes