Commit to merge with wbb
Fix errors