Fix some mess after previous huge commits