Fixing more stuff -- urgh.