Fixed bugs related to latest commits