Minor fixes in the Hot Spots