Fixed various oddities.