Race page view fixes