Fixing of bugs.