Fix errors and warnings
Fix errors and merge