Some more final changes - actually builds now!