Fix some comsutmer issues