minor fixes to comply with Gentoo coding style