Tweaks and fixes

Trying to get inject to work, but to no avail