Various fixes 3

Fixed