small fixes in start up process