more passthrough bugfixes