Fixes for new source forge api & some cleanup