A few tweaks

Prevent some warnings and updates credentials path to be consistent