Fix bugs after 20140412_2100

Fix bugs after 20140412_2100