Workaround some privacy bugs