Various fixes 3