Fix errors after merge with develop branch