A bit more fixes