Clean up some non-critical complains (Juansheng)

Adapted from: https://github.com/Andromadus/htc7x30-3.0/commit/508a77245d9b08393bb5d4bb506a88b80cbe6631