More minor changes for testing