Fixes for w3c validator