Minor fixies