Fixed namespace problems