Fixes Statement controller and report issues.

#420 #421