Fixed timezone and other minor issues