Bug fixes, timezone fix