Runtime fixes
Possible CPU load reduction