More Redmine 2.5.x fixes

Signed-off-by: Brett Patterson <brett.patterson@mss.effem.com>