Fixed a bug in Fort Lonestar

Fixed 2) and 3) from #5933.