ongoing apod fixes