Make things sorta work again
Misc