A bunch of fixes.
Merge remote-tracking branch 'remotes/WorkingRepo/master'
Final fixes.