Fixed setup of default endpoints