Fixed some issues again.