Testing some fixes...