Fixed various things.