Bug fixes.
merge fix