Fixes that make things work, courtesy of Elliot Smith.