PCT-635: Fix bool metrics