Fixes for PLFM-2504, PLFM-2498, and PLFM-2503