Fix remaining bugs...