Some misc. changes