Minor fixes again