Little misc changes for testing