small various fixes