Small changes, bug fixes.