Fixed more baseline problems