Fix [006bd0c74e]: PATCH: BIO_CTRL_PUSH not handled.
Also add some changes from androwish: