Fix some last bugs...