Fix some issues when testing