LAZY bug fixes