Fixed stuff on the WTF bug list.