Fix some Quality issues