Various fixes 4