Fix rich's errors... :(