Patched few bugs on timezone and type