Fixed compilation issues

Just cleaned up broken things