Fix hot and top bugs