Fixed a few odds and ends