Fixed static functions to comply with strict interpreter