Wip/warry fixes