Small various fixes