Some bug fixes and fix for the timezone problem [fixes #55856378]