Minor fixes: