Misc changes, EOD commit