Fixes on bugs.