Fixed some bugs related to the features added yesterday