Addressing minor bugs in standalone main.