Some small clean up things