Massive fixes