Fixes to circumvent gnat-4.6 (ubuntu 14.04) bugs

Also removed concorde solver usage