Possibly patch up new bugs. #1