More various fixes