New fixes again