Small fixes again