Fixes, to be continued