static core and small fix