Tweaking to get compilation working