Minor fixes
Port to my credentials package