Incorporate cred changes and other minor fixes