Add a few "tweaks" for testing