Bug fixes for difficult environments