Fixed bugs from latest commit