Cleanup/fixes

I forgot that Shared.GetSystemTime was broken in the last build...