various fixes for relative minor issues