Changed to fully static libraries