Fine tune a couple of things