More various fixes for url changes
More fixes for various urls