Fixed couple minor bugs.