Minor disabled fixes