Added various missing functions/constants