Fixed a few remaining things.