Fixing weird erros from after merge