Fixes from Greg punchlist