Fixed minor bugs...