Resolve issues according to gedare's comments on the previous cpukit/patch 050802014