several build-time warnings removed