Fix backwards compatibility (and docs)