Minor performance enhancemnts