Testing some fixes