Couple of changes for testing