Fixed up some administrivia stuff