patch build up with issues found under linux