try to fix build + quality of life