Fixed ported regressions - missing ones, unnecessary ones.