Small cpp check fixes