Minor fixes
Implemented hot set