Few Bug fixes.