more Mark specific fixes...