Fix include errors, add address to rail node