Boo, two undefined fixes.