Fixed bugs from meeting