Some changes to makefile to try and get it working