Various fixes

Why ?