Time Sheet fixes and GPS error work around