Cleaned up some trainspawn issues