Issue #29 some generic fixes to fix compile warnings