CustomActivitySpec fixes