Further hackish patches