Error fixes, manager and config