Fixes to reflect namespace changes and automatic showing/hiding of loader.