[BUGFIX] Fixed some bugs related to new CE 1.8.1.0 release.