Make misc. minor improvements