Fixes for Jiras 237, 268, and 284