Fix couple of trivial problems

Especially, the first one works around an annoying GCC bug, i.e.,

https://redports.org/~jkim/20140627192507-85387-218618/acpica-tools-20140627.log