Fixed up various bits and pieces.