Fixes of flaws that came up through strict mode..