Second try to fix some things