Fixes for Joggler support