Updated to lastest upstream versions