Fixes concerning 'enb server'