fixing more hardcoded defaults