Furthey bug fixes.