fixing few things for startup