Corrected a couple of things for HTML 5 support