Builder Service fixes (still need to figure out how to get password)