Small fixes for some of the Spare Parts