General bug fixes
General bug fixes