More small refactorings removing compiler Warnings, etc