Fixed missing import, bundle and warnings