Straightening out some minor issues