Fix some stuff...