Fixing some basic erros