Fix unbound variable reference and opaque descriptor format