Fixes. May even work already.