Function signature fixes
Also, CALL the init function, don't just DEFINE it.