Fixed some errors after merge with blog