Fix some HTML stuff and don't follow Nones