Various fixes, still in flux