More fixes.

Signed-off-by: JC <jay@spruceboy.net>