Bug fixes, sensitive data from config