Redmine #5874: Some users promise compile fixes