Change some minor internal things