Fix issues according to gedare comments on cpukit/github patch 060802014