fix up some crap merged from kvmate-formula...