Cleaner build (warnings eliminated)