Namespace changes to work on Pi