Timezone fix and few initial optimizations