redo workarounds for missing functions