Fixed bugs from Laura