Fixing namespace problems