Use passwd + other fixes