Fixes to comply with w3c