namespace related quick fixes