Tweaking things to work with Koala