Fix more commerical issues