fix bugs from klim8d and oddstr13

Conflicts:
	packer