BUG changes to the function declarations to make it 3.0 compliant

Minor changes to make the module 3.0 compliant