Fix Build Warning & failure