More fixes. Not tested.

Signed-off-by: Hunter Kirkland <hunter.kirkland@live.com>