Various fixes, iow make it work