[BUGFIX] Fixed small bugs.