Minor fixes only...