[master] Fixed bugs