some other various fixes