Minor bug fixes for +trials/+baseline, +events/+check