Other energy issues seep into spill legislation