Testing initial fixes.