moar compile fixes, works now