Minor enhancments