Minor fixes?