Fixed some warnings inherited from origin for our own use