Overlay changes

Reviewers: @donovanhide, @ximinez, @rec
Does the returned error_code need to be checked?