fixed some warnings. may cause other warnings