Fix issues with prefix namespace