Fixed more erros