Fix building issues, everything works now.