Cleaned up references to use specific versions