Fix bugs after last merge and make coding style