Fixed few little bugs.