fixed: Compile warnings + cosmetics