Clean + remove some warnings