Fix bugs from missed refactor & scrutinizer issues