Continuing with 2.5 fixes

Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com>