Several changes to clean things up