#510 Fix some small issues, remove span