Update source with fixes