Add compat functions. Resolves #34