Minor updates for testing