Accidentally global functions: fixed