Bug fixes to get make working for me