Fixed a GUI issue
Fixed yet another machine sync issue
Clean up
Carried the last fix over to the analyzer