Fixed all brokenness with lastest Pull Requests from various authors