Change some small stuffs