w3 some fixes