changed dependency from lib to core, get rid of some warnings