Small changes.
Add workaround fix for bugs.