General Bug fixes
General bug fixes